diff --git a/bcilab_config.m b/bcilab_config.m
index 67a69f40..072c5cf9 100644
--- a/bcilab_config.m
+++ b/bcilab_config.m
@@ -8,9 +8,16 @@
 % argument to the "bcilab" function (e.g. cd /your/path/to/bcilab; bcilab
 % /your/path/to/your/bcilab_config.m)
 
+% This file is loaded by bcilab.m -- note that you can have a version of the file in your ~/.bcilab/
+% directory, which will take precedence over a file of same name placed in the bcilab folder (see
+% bcilab.m), and that you can specify a custom config file to load.
+%
+% The options in this configuration file can also be edited via the GUI (under Settings); the GUI
+% always edits the file that was used when the toolbox was loaded.
+
 % this is your data path, i.e., where your studies and data sets are stored
-data = {'/data/projects'};
-data = [];
+% (if empty, will default to your bcilab:/userdata folder)
+data = []; % e.g., {'/data/myprojects','bcilab:/userdata','home:/mydata'};
 
 % this is a path where results can be stored (you must have write permission)
 % (if empty, it is set to equal the data path)
@@ -28,7 +35,8 @@
 else
     cache = [];
 end
-% comment out this line to enable caching of intermediate results
+% comment out this line to enable caching of intermediate results in one of the above default linux
+% temp folders
 cache = [];
 
 % This is the memory capacity that is being reserved for in-memory caching of intermediate results.
@@ -56,9 +64,14 @@
 data_reuses = 3;
 
 % this is a directory for temporary results (e.g. IC decompositions); if this is empty, it will be
-% set to a directory next to your BCILAB path
+% set to a directory that is your BCILAB installation path with -temp appended.
 temp = [];
 
+% if you have private plugins that you manage separately from the bcilab directory tree, you can set
+% the path to these here (using the same sub-directory structure as ~/.bcilab/, see that folder for
+% reference)
+private = [];
+
 % whether to show the main BCILAB menu by default (if this is set to 'separate', the menu is 
 % always detached from the EEGLAB main menu; otherwise it is under Tools>BCILAB)
 menu = 'separate';
@@ -75,5 +88,3 @@
 acquire_options = {'Hostnames',{'localhost'},'ShutdownTimeout',300};
 
 
-
-
diff --git a/code/dataset_editing/set_concat.m b/code/dataset_editing/set_concat.m
index 06f7b6bd..c4f56c0e 100644
--- a/code/dataset_editing/set_concat.m
+++ b/code/dataset_editing/set_concat.m
@@ -48,7 +48,7 @@
         end
         % count events, epochs and samples in each set
         event_count = cellfun(@(x)length(x.event),varargin);
-        sample_count = cellfun(@(x)x.pnts,varargin).*epoch_count;
+        sample_count = cellfun(@(x)x.pnts,varargin);
         % concatenate .event and .epoch fields
         event = cellfun(@(x)x.event,varargin,'UniformOutput',false); result.event = [event{:}];
         % shift event latencies based on cumulative sample counts
diff --git a/code/environment/env_startup.m b/code/environment/env_startup.m
index 9bcda918..47f5aace 100644
--- a/code/environment/env_startup.m
+++ b/code/environment/env_startup.m
@@ -24,6 +24,9 @@ function env_startup(varargin)
 %                       (default: path/to/bcilab-temp, or path/to/cache/bcilab_temp if a cache
 %                       directory was specified)
 %
+%               'private': optional private plugin directory, separate from bcilab/*; can have
+%                          the same directory structure as ~/.bcilab/ (default: [])
+%
 %               --- caching settings ---
 %
 %               'cache': Path where intermediate data sets are cached. Should be located on a fast 
@@ -209,7 +212,7 @@ function env_startup(varargin)
     disp('Note: Your version of MATLAB is not supported by BCILAB any more. You may try BCILAB version 0.9, which supports old MATLAB''s back to version 2006a.'); end    
 
 % get options
-opts = hlp_varargin2struct(varargin,'data',[],'store',[],'cache',[],'temp',[],'mem_capacity',2,'data_reuses',3, ...
+opts = hlp_varargin2struct(varargin,'data',[],'store',[],'cache',[],'temp',[],'private',[],'mem_capacity',2,'data_reuses',3, ...
     'parallel',{'use','local'}, 'menu',true, 'configscript','', 'worker',false, 'autocompile',true, 'acquire_options',{}, ...
     'show_experimental',false,'show_guru',false);
 
@@ -218,6 +221,8 @@ function env_startup(varargin)
 env_load_dependencies(dependency_dir,opts.autocompile);
 if exist(env_translatepath('home:/.bcilab/code/dependencies'),'dir')
     env_load_dependencies(env_translatepath('home:/.bcilab/code/dependencies'),opts.autocompile); end
+if ~isempty(opts.private) && exist(env_translatepath([opts.private '/code/dependencies']),'dir')
+    env_load_dependencies(env_translatepath([opts.private '/code/dependencies']),opts.autocompile); end
 
 if ischar(opts.worker)
     try
@@ -248,7 +253,7 @@ function env_startup(varargin)
     opts.data = {opts.data}; end
 for d = 1:length(opts.data)
     opts.data{d} = path_normalize(opts.data{d}); end
-if isempty(opts.data) || ~any(cellfun(@exist,opts.data))
+if isempty(opts.data)
     opts.data = {[base_dir 'userdata']}; end
 
 % process store directory
@@ -297,7 +302,7 @@ function env_startup(varargin)
 
 % set global variables
 global tracking
-tracking.paths = struct('bcilab_path',{base_dir(1:end-1)}, 'function_path',{function_dir}, 'data_paths',{opts.data}, 'store_path',{opts.store}, 'dependency_path',{dependency_dir},'resource_path',{resource_dir},'temp_path',{opts.temp});
+tracking.paths = struct('bcilab_path',{base_dir(1:end-1)}, 'function_path',{function_dir}, 'data_paths',{opts.data}, 'store_path',{opts.store}, 'dependency_path',{dependency_dir},'resource_path',{resource_dir},'temp_path',{opts.temp}, 'private_path',{opts.private});
 for d=1:length(opts.cache)
     location = rmfield(opts.cache{d},'tag');
     % convert GiB to bytes
@@ -406,6 +411,8 @@ function env_startup(varargin)
     disp('cache is disabled');
 end
 disp(['temp is in ' opts.temp]);
+if ~isempty(opts.private)
+    disp(['private plugins are in ' opts.private]); end
 fprintf('\n');
 
 
@@ -463,6 +470,22 @@ function env_startup(varargin)
         end
     catch,end
 
+    % add private plugin directories to the path
+    if ~isempty(opts.private)
+        try
+            private_codedirs = {['code' filesep 'filters'],['code' filesep 'dataset_editing'], ...
+                ['code' filesep 'machine_learning'], ['code' filesep 'paradigms'], ['code' filesep 'scripts']};
+            % and add the code directories to the path
+            for d = private_codedirs
+                tmpdir  = env_translatepath([opts.private filesep d{1}]);
+                if exist(tmpdir,'dir')
+                    addpath(genpath(tmpdir)); end
+            end
+        catch e
+            disp(['Could not add private code directories to path: ' e.message]);
+        end
+    end
+    
     % create a menu
     if ~(isequal(opts.menu,false) || isequal(opts.menu,0))
         try
diff --git a/code/environment/env_translatepath.m b/code/environment/env_translatepath.m
index 191dd5c4..eab2149d 100644
--- a/code/environment/env_translatepath.m
+++ b/code/environment/env_translatepath.m
@@ -10,6 +10,11 @@
 % 30])", and this in turn allows to share the same data set caches (which are indexed by expression)
 % across machines and operating systems, minimizing redundant computations.
 %
+% Some of the path references, such as data:/, temp:/, store:/, private:/ can be set in the startup
+% arguments of bcilab.m or bcilab_config.m (see documentation in those files). It is permitted to
+% use other relative paths, such as home:/ when specifying those arguments (but circular references
+% must be avoided).
+%
 % In:
 %   IndependentPath : platform-independent path; may contain forward and/or backward slashes
 %                     (forward slashes generally preferred), and may refer to locations such as
@@ -42,7 +47,6 @@
 %   % resolve a reference to the resources directory
 %   env_translatepath('resources:/workspaces/testing.mat')
 %
-%
 % See also:
 %   env_startup, io_loadset
 %
@@ -51,47 +55,56 @@
 
 global tracking;
 
-% turn the path into a system-dependent one
-filename = strrep(strrep(filename,'\',filesep),'/',filesep);
+% function to sanitize file names (replace file separators by system-dependent version)
+sanitize = @(filename) strrep(strrep(strrep(filename,'\',filesep),'/',filesep),[filesep filesep],filesep);
 
-% resolve location references
-if strncmp('store:',filename,6)
-    filename = [tracking.paths.store_path filename(1+length('store:'):end)]; 
-elseif strncmp('resources:',filename,10)
-    filename = [tracking.paths.resource_path filename(1+length('resources:'):end)]; 
-elseif strncmp('temp:',filename,5)
-    filename = [tracking.paths.temp_path filename(1+length('temp:'):end)]; 
-elseif strncmp('functions:',filename,10)
-    filename = [tracking.paths.function_path filename(1+length('functions:'):end)]; 
-elseif strncmp('bcilab:',filename,7)
-    filename = [tracking.paths.bcilab_path filename(1+length('bcilab:'):end)]; 
-elseif strncmp('dependencies:',filename,13)
-    filename = [tracking.paths.dependency_path filename(1+length('dependencies:'):end)];
-elseif strncmp('home:',filename,5)
-    filename = [hlp_homedir filename(1+length('home:'):end)];
-elseif strncmp('data:',filename,5)
-    rest = filename(1+length('data:'):end);
-    bestpath = 1; bestlen = -1;
-    if length(tracking.paths.data_paths) > 1
-        fpieces = hlp_split(rest,filesep);
-        % find the data path that contains the longest prefix of the filename
-        for pidx=1:length(tracking.paths.data_paths)
-            p = tracking.paths.data_paths{pidx};
-            % for each prefix of the filename (starting with the longest one)
-            for k=length(fpieces):-1:0
-                % check if the data path plus the first k pieces of the filename exists
-                if exist([p sprintf([filesep '%s'],fpieces{1:k})],'file')
-                    % found a match - check if it is a new length record among all our data paths...
-                    if k>bestlen
-                        bestlen = k;
-                        bestpath = pidx;
+% loop until all path references have been resolved
+while true
+    % resolve location references
+    if strncmp('store:',filename,6)
+        filename = [tracking.paths.store_path filename(1+length('store:'):end)]; 
+    elseif strncmp('resources:',filename,10)
+        filename = [tracking.paths.resource_path filename(1+length('resources:'):end)]; 
+    elseif strncmp('temp:',filename,5)
+        filename = [tracking.paths.temp_path filename(1+length('temp:'):end)]; 
+    elseif strncmp('functions:',filename,10)
+        filename = [tracking.paths.function_path filename(1+length('functions:'):end)]; 
+    elseif strncmp('bcilab:',filename,7)
+        filename = [tracking.paths.bcilab_path filename(1+length('bcilab:'):end)]; 
+    elseif strncmp('dependencies:',filename,13)
+        filename = [tracking.paths.dependency_path filename(1+length('dependencies:'):end)];
+    elseif strncmp('private:',filename,8)
+        filename = [tracking.paths.private_path filename(1+length('private:'):end)];
+    elseif strncmp('home:',filename,5)
+        filename = [hlp_homedir filename(1+length('home:'):end)];
+    elseif strncmp('data:',filename,5)
+        rest = filename(1+length('data:'):end);
+        bestpath = 1; bestlen = -1;
+        if length(tracking.paths.data_paths) > 1
+            % find the data path that contains the longest prefix of the filename
+            fpieces = hlp_split(sanitize(rest),filesep);
+            for pidx=1:length(tracking.paths.data_paths)
+                p = env_translatepath(tracking.paths.data_paths{pidx});
+                % for each prefix of the filename (starting with the longest one)
+                for k=length(fpieces):-1:0
+                    % check if the data path plus the first k pieces of the filename exists
+                    if exist([p filesep fpieces{1:k}],'file')
+                        % found a match - check if it is a new length record among all our data paths...
+                        if k>bestlen
+                            bestlen = k;
+                            bestpath = pidx;
+                        end
+                        break;
                     end
-                    break;
                 end
             end
         end
+        % resolve the reference using that data path which matches most of the filename,
+        % where, if multiple data paths are equally well suited, the first one of them is taken
+        filename = [tracking.paths.data_paths{bestpath} rest];
+    else
+        break;
     end
-    % resolve the reference using that data path which matches most of the filename,
-    % where, if multiple data paths are equally well suited, the first one of them is taken
-    filename = [tracking.paths.data_paths{bestpath} rest];
 end
+
+filename = sanitize(filename);
diff --git a/code/filters/flt_pipeline.m b/code/filters/flt_pipeline.m
index 389d4296..08b66ff4 100644
--- a/code/filters/flt_pipeline.m
+++ b/code/filters/flt_pipeline.m
@@ -391,6 +391,10 @@
              dir(env_translatepath('functions:/dataset_editing/set_*.m'));
              dir(env_translatepath('functions:/filters/in_development/flt_*.m'));
              dir(env_translatepath('functions:/dataset_editing/in_development/set_*.m'));
+             dir(env_translatepath('private:/code/filters/flt_*.m'));
+             dir(env_translatepath('private:/code/dataset_editing/set_*.m'));
+             dir(env_translatepath('private:/code/filters/in_development/flt_*.m'));
+             dir(env_translatepath('private:/code/dataset_editing/in_development/set_*.m'));
              dir(env_translatepath('home:/.bcilab/code/filters/flt_*.m'));
              dir(env_translatepath('home:/.bcilab/code/dataset_editing/set_*.m'))];
 
diff --git a/code/gui/gui_batchanalysis.m b/code/gui/gui_batchanalysis.m
index be10c20e..5e1caf3b 100644
--- a/code/gui/gui_batchanalysis.m
+++ b/code/gui/gui_batchanalysis.m
@@ -81,6 +81,7 @@ function gui_batchanalysis_OpeningFcn(hObject, eventdata, handles, varargin)
 % hObject    handle to figure
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    structure with handles and user data (see GUIDATA)
+global tracking;
 
 % turn all large edit panes to multi-line editors
 for obj = {handles.edit1,handles.edit20,handles.edit19}
@@ -93,7 +94,10 @@ function gui_batchanalysis_OpeningFcn(hObject, eventdata, handles, varargin)
 
 % get all paradigm names
 para_files = [];
-for p = {'functions:/paradigms', 'home:/.bcilab/code/paradigms'}
+para_paths = {'functions:/paradigms', 'functions:/paradigms/in_development', 'home:/.bcilab/code/paradigms'};
+if ~isempty(tracking.paths.private_path)
+    para_paths = [para_paths {'private:/code/paradigms','private:/code/paradigms/in_development'}]; end
+for p = para_paths
     para_files = [para_files dir([env_translatepath(p{1}) filesep 'Paradigm*.m'])]; end
 para_acronyms = cellfun(@(s)s(9:end-2),{para_files.name},'UniformOutput',false);
 
diff --git a/code/gui/utils/gui_listapproaches.m b/code/gui/utils/gui_listapproaches.m
index 2910311e..23a088c1 100644
--- a/code/gui/utils/gui_listapproaches.m
+++ b/code/gui/utils/gui_listapproaches.m
@@ -27,6 +27,11 @@
     {'Built-in Paradigms', {'functions:/paradigms'}}, ...
     {'User Paradigms', {'home:/.bcilab/code/paradigms'}}, ...
     {'Experimental Paradigms',quickif(tracking.gui.show_experimental,{'functions:/paradigms/in_development'},{})}};
+if ~isempty(tracking.paths.private_path)
+    paradigm_locations = [paradigm_locations { ...
+        {'Private Paradigms', {'private:/code/paradigms'}}, ...
+        {'Private Experimental Paradigms',quickif(tracking.gui.show_experimental,{'private:/code/paradigms/in_development'},{})}}];
+end
 
 for loc=1:length(paradigm_locations)
     if ~isempty(paradigm_locations{loc}{2})
@@ -68,7 +73,7 @@
 for v=find(strcmp({vars.class},'cell'))
     var = evalin('base',vars(v).name);
     if length(var)>1 && ischar(var{1}) && ((strncmp(var{1},'Paradigm',8) && length(var{1})>8 && any(strcmp(var{1}(9:end),paradigm_names))) || any(strcmp(var{1},paradigm_names)))
-        approaches{end+1} = struct('paradigm',quickif(strncmp(var{1},'Paradigm',8),var{1},['Paradigm',var{1}]),'name',vars(v).name,'parameters',{var(2:end)}); end
+        approaches{end+1} = struct('paradigm',quickif(strncmp(var{1},'Paradigm',8),var{1},['Paradigm',var{1}]),'name',vars(v).name,'parameters',{var(2:end)},'description',''); end
 end
 
 list = [list {'From Workspace', approaches}];
@@ -77,6 +82,8 @@
 % --- aggregate all approaches in the approaches directory (and the user's home directory, too) ---
 approaches = {};
 approach_dirs = {env_translatepath('home:/.bcilab/approaches'),env_translatepath('resources:/approaches')};
+if ~isempty(tracking.paths.private_path)
+    approach_dirs = [approach_dirs {env_translatepath('private:/approaches')}]; end
 for d = approach_dirs
     approach_dir = d{1};
     files = dir([approach_dir filesep '*.apr']);
diff --git a/code/machine_learning/ml_train.m b/code/machine_learning/ml_train.m
index 6c942311..59601e43 100644
--- a/code/machine_learning/ml_train.m
+++ b/code/machine_learning/ml_train.m
@@ -180,10 +180,14 @@
 
 function learners = list_learners(update_list)
 % list all the learning functions in code/machine_learning/
+global tracking;
 persistent memo;
 if isempty(memo) || exist('update_list','var') && update_list
     memo = {};
-    for p = {'functions:/machine_learning/ml_train*.m','home:/.bcilab/code/machine_learning/ml_train*.m'}
+    ml_paths = {'functions:/machine_learning/ml_train*.m','home:/.bcilab/code/machine_learning/ml_train*.m'};
+    if ~isempty(tracking.paths.private_path)
+        ml_paths = [ml_paths {'private:/code/machine_learning/ml_train*.m'}]; end
+    for p = ml_paths
         modules = dir(env_translatepath(p{1}));
         names = setdiff({modules.name},{'ml_train.m','ml_trainvote.m'});
         tags = cellfun(@(n) n(9:end-2),names,'UniformOutput',false);
diff --git a/code/online_plugins/Neuroscan/BCILAB.readme b/code/online_plugins/Neuroscan/BCILAB.readme
new file mode 100755
index 00000000..6b5d2f37
--- /dev/null
+++ b/code/online_plugins/Neuroscan/BCILAB.readme
@@ -0,0 +1,18 @@
+README for Neuroscan Scan Plugin for BCILAB
+Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+         Released under the GPLv3, see COPYING.txt
+         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+
+Plugin to stream EEG data and event markers from Neuroscan Scan software to BCILAB. Has been tested with Scan 4.3 and a NuAmps 40-channel amplifier
+
+Associated Files:
+
+BCILAB/code/online_plugins/Neuroscan:
+ns_close.m
+ns_open.m
+ns_parseheader.m
+ns_parseinfo.m
+ns_read.m
+ns_sendpacket.m
+run_readneuroscan.m
\ No newline at end of file
diff --git a/code/online_plugins/Neuroscan/COPYING.txt b/code/online_plugins/Neuroscan/COPYING.txt
new file mode 100755
index 00000000..94a9ed02
--- /dev/null
+++ b/code/online_plugins/Neuroscan/COPYING.txt
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/code/online_plugins/Neuroscan/ns_close.m b/code/online_plugins/Neuroscan/ns_close.m
new file mode 100755
index 00000000..ee3a100a
--- /dev/null
+++ b/code/online_plugins/Neuroscan/ns_close.m
@@ -0,0 +1,26 @@
+function ns_close(h)
+% Close a TCP connection to Neuroscan Scan
+% ns_close(h)
+%
+%
+% In:
+%   h : handle to an existing Neuroscan connection
+%     
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+
+% send message to Scan to stop sending data
+ns_sendpacket(TCP_Connection,'CTRL',3,4,0);
+% and indicate that connection is closing
+ns_sendpacket(TCP_Connection,'CTRL',1,2,0);
+
+if ~h.initialized
+    return;
+end
+disp('Cleaning up connection to Neuroscan Scan');
+pnet(h.handle, 'close');
+if evalin('base', ['exist(' 'sprintf(''%s'', h.name)' ')'])
+    evalin('base',['clear ' sprintf('%s',h.name) ';']);
+end
\ No newline at end of file
diff --git a/code/online_plugins/Neuroscan/ns_open.m b/code/online_plugins/Neuroscan/ns_open.m
new file mode 100644
index 00000000..64c80f93
--- /dev/null
+++ b/code/online_plugins/Neuroscan/ns_open.m
@@ -0,0 +1,89 @@
+function h = ns_open(hostname, port)
+% Open a TCP connection to Neuroscan Recorder
+% h = ns_open(Hostname, Port)
+%     
+%
+% In:
+%   Hostname: Source TCP hostname. Can be a computer name, URL, or IP
+%       address
+%
+%   Port : the port on which to connect to the TCP host
+%
+% Out:
+%   h : handle to a newly opened Neuroscan connection
+%
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+
+% open the connection
+h.handle = pnet('tcpconnect', hostname, port);
+ConnectionStatus = pnet(h.handle,'status');
+
+if ConnectionStatus > 0
+    disp('Neuroscan Scan connection established');
+else
+    error('Neuroscan Scan connection failed - check the IP and port');
+end
+
+% flush the buffer
+bufferData = pnet(h.handle,'read', 'noblock');
+while ~isempty(bufferData);
+    bufferData = pnet(h.handle,'read', 'noblock');
+end
+
+% request basic header
+ns_sendpacket(h.handle,'CTRL',3,5,0);
+
+% try
+    % read reader and basic info
+    packetBytes = pnet(h.handle,'read', 40, 'uint8');
+    
+    % parse header data
+    header = ns_parseheader(packetBytes(1:12));
+    basicinfo = ns_parseinfo(packetBytes(13:end));
+
+    % attach Neuroscan parameters to connection handle
+    infoFields = fields(basicinfo);
+    for f = 1:length(infoFields)
+        h.(infoFields{f}) = basicinfo.(infoFields{f});
+    end
+    
+    h.totalChan = h.numChan + h.numEventChan;
+    
+    if h.numEventChan ~= 0
+        h.markerChanIdx = h.numChan + 1;
+    end
+    
+    % number of bytes for neuroscan header
+    h.headerSize = 12;
+    
+    % save the block size, equal to the number of channels (including
+    % marker channel) x the number of samples per block x the number of
+    % bytes per sample
+    h.dataBlockSize = (basicinfo.numChan + basicinfo.numEventChan) ...
+        * basicinfo.samplesPerBlock * basicinfo.bytesPerSample;
+    
+    % save the data type (16 or 32 bit integer) for later casting
+    if h.bytesPerSample == 2
+        h.datatype = 'int16';
+    elseif h.bytesPerSample == 4
+        h.datatype = 'int32';
+    else
+        error('expecting either 2 or 4 bytes per sample');
+    end
+
+    h.cleanup = onCleanup(@()pnet(h.handle, 'close'));
+        
+    % instruct Scan to begin sending data
+    ns_sendpacket(h.handle,'CTRL',3,3,0);    
+    h.initialized = true;
+
+% catch er
+%     disp(er.message);
+%     return;
+% end
+
+end
+
diff --git a/code/online_plugins/Neuroscan/ns_parseheader.m b/code/online_plugins/Neuroscan/ns_parseheader.m
new file mode 100755
index 00000000..944f1356
--- /dev/null
+++ b/code/online_plugins/Neuroscan/ns_parseheader.m
@@ -0,0 +1,36 @@
+function hdr = ns_parseheader(header)
+% Parse the header info packet returned by Neuroscan Scan server
+% hdr = ns_parseinfo(dataBytes)
+%
+%
+% In:
+%   dataBytes : 12 byte array returned by Neuroscan server as header
+%
+% Out:
+%   hdr: Structure containing each element of packet header as a field.
+%        Header information includes:
+%
+%       id: ID string, 'CTRL', 'FILE', or 'DATA'
+%
+%       code: Control code, 1 (General), 2 (Server), or 3 (Client)
+%
+%       req: Request value, see the Neuroscan Acquire manual
+%
+%       bodysize: Size (in bytes) of message attached to header,
+%           or 0 if packet does not contain a data body (for example start
+%           or stop acquisition messages)
+%
+%     
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+
+hdr = struct('id',[],'code',[],'req',[],'bodysize',[]);
+
+hdr.id = char(header(1:4));
+hdr.code = double(typecast(fliplr(uint8(header(5:6))), 'uint16'));   
+hdr.req = double(typecast(fliplr(uint8(header(7:8))), 'uint16'));
+hdr.bodysize = double(typecast(fliplr(uint8(header(9:12))), 'uint32'));
+
+   
\ No newline at end of file
diff --git a/code/online_plugins/Neuroscan/ns_parseinfo.m b/code/online_plugins/Neuroscan/ns_parseinfo.m
new file mode 100755
index 00000000..17b132fc
--- /dev/null
+++ b/code/online_plugins/Neuroscan/ns_parseinfo.m
@@ -0,0 +1,47 @@
+function basicinfo = ns_parseinfo(dataBytes)
+% Parse the basic info packet returned by Neuroscan Scan
+% basicinfo = ns_parseinfo(dataBytes)
+%
+%
+% In:
+%   dataBytes : 28 byte array returned by Neuroscan server after requesting
+%   basic info
+%
+% Out:
+%   basicinfo: Structure containing each element of basic EEG info as a
+%   field. EEG info includes:
+%
+%       size: size of info array (in bytes)
+%
+%       numChan: number of EEG data channels
+%
+%       numEventChan: number of event marker channels
+%
+%       samplesPerBlock: the number of data samples transmitted each block
+%
+%       srate: data sampling rate in Hz
+%
+%       bytesPerSamples: number of bytes per sample, either 2 (16 bits
+%       per sample) or 4 (32 bits per sample)
+%
+%       resolution: the value in microvolts represented by the least
+%       significant bit 
+%
+%     
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+% basic EEG info 
+basicinfo = struct('size',[],'numChan',[],'numEventChan',[],'samplesPerBlock',[],...
+    'srate', [], 'bytesPerSample', [], 'resolution', []);
+
+basicinfo.size = double(typecast((uint8(dataBytes(1:4))), 'int32')); 
+basicinfo.numChan = double(typecast((uint8(dataBytes(5:8))), 'int32')); 
+basicinfo.numEventChan = double(typecast((uint8(dataBytes(9:12))), 'int32'));
+basicinfo.samplesPerBlock = double(typecast((uint8(dataBytes(13:16))), 'int32'));
+basicinfo.srate = double(typecast((uint8(dataBytes(17:20))), 'int32'));
+basicinfo.bytesPerSample = double(typecast((uint8(dataBytes(21:24))), 'int32'));
+basicinfo.resolution = double(typecast((uint8(dataBytes(25:28))), 'single'));
+
+end
diff --git a/code/online_plugins/Neuroscan/ns_read.m b/code/online_plugins/Neuroscan/ns_read.m
new file mode 100755
index 00000000..2c0b7907
--- /dev/null
+++ b/code/online_plugins/Neuroscan/ns_read.m
@@ -0,0 +1,84 @@
+function block = ns_read(h)
+% Block reader for Neuroscan Scan Recorder
+% ns_read(h)
+%
+%
+% In:
+%   h : handle to an existing Neuroscan connection
+%
+% Out:
+%   block: cell array data block containing EEG and event values
+%     
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+data = [];
+if (~h.initialized)
+    return;
+end
+
+try
+    % check for existing data in socket buffer
+    headerBytes = pnet(h.handle, 'read', h.headerSize, 'uint8', 'noblock');
+    
+    events = [];
+                
+    if ~isempty(headerBytes)
+        
+        headerData = ns_parseheader(headerBytes);
+        
+        if strcmp(headerData.id, 'DATA')
+            
+            % wait until the data packet body is available
+            dataPreview = [];
+            while length(dataPreview) < headerData.bodysize
+                % wait until the rest of the packet is available
+                dataPreview = pnet(h.handle, 'read', headerData.bodysize,...
+                    'uint8', 'view', 'noblock');
+            end
+            
+            % read the data packet body
+            dataBytes = pnet(h.handle, 'read', headerData.bodysize, 'uint8', 'noblock');
+            
+            dataBytes = reshape(uint8(dataBytes), [h.bytesPerSample, h.totalChan, h.samplesPerBlock]);
+            
+            markerValues = squeeze((dataBytes(1,h.markerChanIdx, :)));
+            markerPoints = find(markerValues);
+                        
+            if ~isempty(markerPoints)
+                markers = markerValues(markerPoints);
+                latencies = markerPoints;
+                for m = 1:length(markers)
+                   events(m).type = num2str(markers(m)); %#ok<AGROW>
+                   events(m).latency = latencies(m); %#ok<AGROW>
+                end
+            else
+               events = []; 
+            end
+            
+            dataBytes(:,h.markerChanIdx, :) = [];
+            
+            dataCell = squeeze(num2cell(dataBytes, 1));
+            dataBlock = cellfun(@(x) typecast(x, h.datatype), dataCell);
+            data = horzcat(data, dataBlock);
+                        
+        else
+            disp('unknown message');
+        end
+                
+    end
+    
+        
+catch er
+    disp(er.message);
+    rethrow(er);
+end
+
+if ~isempty(data)
+    % scale data to uV units
+    data = bsxfun(@times,data,h.resolution);
+end
+
+block = {data,events};
+
diff --git a/code/online_plugins/Neuroscan/ns_sendpacket.m b/code/online_plugins/Neuroscan/ns_sendpacket.m
new file mode 100755
index 00000000..d8a19a2e
--- /dev/null
+++ b/code/online_plugins/Neuroscan/ns_sendpacket.m
@@ -0,0 +1,35 @@
+function ns_sendpacket(h,id,code,request,bodysize)
+% Prepare and send a data packet to Neuroscan Scan server
+% ns_sendpacket(h,id,code,request,bodysize)
+%     
+%
+% In:
+%   h: PNET connection handle
+%
+%   id: Neuroscan message ID string
+%
+%   code: Neuroscan message code value
+%
+%   request: Neuroscan message request value
+%
+%   bodysize: Size of message body
+%
+% Note: See the Neuroscan Scan documentation for description of message ID,
+%   code, and request values
+%
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+
+% assemble the packet
+packet = zeros(12,1,'uint8');
+packet(1:4) = id;
+packet(5:6) = fliplr(typecast(int16(code),'int8'));
+packet(7:8) = fliplr(typecast(int16(request),'int8'));
+packet(9:12) = fliplr(typecast(int32(bodysize),'int8'));
+% write the packet
+pnet(h,'write', packet)
+    
+end
+    
\ No newline at end of file
diff --git a/code/online_plugins/Neuroscan/run_readneuroscan.m b/code/online_plugins/Neuroscan/run_readneuroscan.m
new file mode 100755
index 00000000..9dd7cbe9
--- /dev/null
+++ b/code/online_plugins/Neuroscan/run_readneuroscan.m
@@ -0,0 +1,73 @@
+function run_readneuroscan(varargin)
+% Receive real-time data from Neuroscan Scan Recorder
+% run_readneuroscan(MatlabStream,InputHost,Port)
+%
+%
+% In:
+%   MatlabStream : name of the stream to create in the MATLAB environment (default: 'laststream')
+%     
+%   InputHost: Source TCP hostname. Can be a computer name, URL, or IP
+%              address (default: '127.0.0.1')
+%   
+%   Port : the port on which to connect to the TCP host (default: 4000)
+%     
+%   UpdateFrequency : update frequency, in Hz (default: 25)
+%     
+%     Examples:
+%     % open an input stream that named 'newstream' on port 5000, using all
+%     % other defaults
+%     run_readneuroscan('MatlabStream', 'newstream', 'Port', 5000);
+%
+% Author: Visual Attention and Cognition Lab, Dan Roberts, and Nick Pe�aranda, George Mason University, Spring 2014
+%         Released under the GPLv3, see COPYING.txt
+%         Based on the BrainVision BCILAB plug-in by Hal Greenwald
+
+% declare the name of this component (shown in the menu)
+declare_properties('name','Neuroscan Recorder');
+
+% read options
+opts = arg_define(varargin, ...
+    arg({'new_stream','MatlabStream'}, 'laststream',[],'New Stream to create. This is the name of the stream within the MATLAB environment.'), ...
+    arg({'src_hostname','InputHost'}, '127.0.0.1',[],'Source TCP hostname. Can be a computer name, URL, or IP address.'), ...
+    arg({'src_port','Port'}, 4000,[],'TCP Host Port.'), ...
+    arg({'update_freq','UpdateFrequency'}, 25,[],'Update frequency (Hz). New data is polled at this rate, in Hz.'),...
+    arg({'chan_labels', 'ChannelLabels'}, 'standard', [], 'Enter custom channel labels if applicable')...
+    );
+
+% open a connection
+h = ns_open(opts.src_hostname, opts.src_port);
+
+if strcmpi(opts.chan_labels, 'standard')
+    if h.numChan == 40 % assume standard NuAmps 40-channel montage
+        h.channelNames = {'HEOL', 'HEOR', 'FP1', 'FP2', 'VEOU', 'VEOL', 'F7', 'F3', 'FZ',...
+            'F4', 'F8', 'FT7', 'FC3', 'FCZ', 'FC4', 'FT8', 'T3', 'C3', 'CZ', 'C4', 'T4', ...
+            'TP7', 'CP3', 'CPZ', 'CP4', 'TP8', 'A1', 'T5', 'P3', 'PZ', 'P4', 'T6', ...
+            'A2', 'O1', 'OZ', 'O2', 'FT9', 'FT10', 'PO1', 'PO2'};
+    elseif h.numChan == 68 % assume standard SynAmps2 montage,
+        % which includes 64 EEG channels + VEOG, HEOG, EKG, EMG
+        h.channelNames = {'FP1','FPZ','FP2','AF3','AF4','F7','F5','F3',...
+            'F1','FZ','F2','F4','F6','F8','FT7','FC5','FC3','FC1','FCZ',...
+            'FC2','FC4','FC6','FT8','T7','C5','C3','C1','CZ','C2','C4',...
+            'C6','T8','M1','TP7','CP5','CP3','CP1','CPZ','CP2','CP4',...
+            'CP6','TP8','M2','P7','P5','P3','P1','PZ','P2','P4','P6',...
+            'P8','PO7','PO5','PO3','POZ','PO4','PO6','PO8','CB1','O1',...
+            'OZ','O2','CB2','VEO','HEO','EKG','EMG'};        
+    else
+       error('unknown default channel labels for this montage'); 
+    end
+else % custom channel labels
+    opts.chan_labels = evalin('base', opts.chan_labels);
+    if length(opts.chan_labels) ~= h.numChan
+        errorMsg = sprintf('the number of custom channel labels provided (%i) does not match the number of channels in the data stream (%i)', length(opts.chan_labels), h.numChan);
+        ns_close(h);
+        error(errorMsg); %#ok<SPERR>
+    end
+end
+
+h.name = opts.new_stream;
+
+%Create and initialize online stream
+onl_newstream(opts.new_stream, 'srate', h.srate, 'chanlocs', h.channelNames, 'data', zeros(length(h.channelNames),0,0),'xmin',toc(uint64(0)));
+
+% start background acquisition
+onl_read_background(opts.new_stream,@()ns_read(h), opts.update_freq);
\ No newline at end of file
diff --git a/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_options.m b/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_options.m
index 2d6d1220..0d60422e 100644
--- a/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_options.m
+++ b/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_options.m
@@ -8,7 +8,7 @@
 option_savetwofiles = 1 ; % If set, save not one but two files for each dataset (header and data). This allows faster data loading in studies.
 option_saveica = 0 ; % If set, write ICA activations to disk. This speeds up loading ICA components when dealing with studies.
 % Memory options 
-option_single = 1 ; % If set, use single precision under Matlab 7.x. This saves RAM but can lead to rare numerical imprecisions.
+option_single = 0 ; % If set, use single precision under Matlab 7.x. This saves RAM but can lead to rare numerical imprecisions.
 option_memmapdata = 0 ; % If set, use memory mapped array under Matlab 7.x. This may slow down some computation.
 option_eegobject = 0 ; % If set, use the EEGLAB EEG object instead of the standard EEG structure (experimental).
 % ICA options 
diff --git a/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_optionsbackup.m b/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_optionsbackup.m
index 872a6e95..c901b5a8 100644
--- a/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_optionsbackup.m
+++ b/dependencies/eeglab_10_0_1_0x/functions/adminfunc/eeg_optionsbackup.m
@@ -8,7 +8,7 @@
 option_savetwofiles  = 1 ;  % If set, save not one but two files for each dataset (header and data). This allows faster data loading in studies.
 option_saveica       = 0 ;  % If set, write ICA activations to disk. This speeds up loading ICA components when dealing with studies.
 % Memory options 
-option_single        = 1 ;  % If set, use single precision under Matlab 7.x. This saves RAM but can lead to rare numerical imprecisions. 
+option_single        = 0 ;  % If set, use single precision under Matlab 7.x. This saves RAM but can lead to rare numerical imprecisions. 
 option_memmapdata    = 0 ;  % If set, use memory mapped array under Matlab 7.x. This may slow down some computation. 
 option_eegobject     = 0 ;  % If set, use the EEGLAB EEG object instead of the standard EEG structure (experimental). 
 % ICA options 
diff --git a/dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11b/eeg_load_xdf.m b/dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11b/eeg_load_xdf.m
index abd5edeb..edcb9f46 100644
--- a/dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11b/eeg_load_xdf.m
+++ b/dependencies/eeglab_10_0_1_0x/plugins/xdfimport1.11b/eeg_load_xdf.m
@@ -66,7 +66,7 @@
 if args.effective_rate && isfinite(stream.info.effective_srate) && stream.info.effective_srate>0
     raw.srate = stream.info.effective_srate;
 else
-    raw.srate = str2num(stream.info.nominal_srate);
+    raw.srate = str2num(stream.info.nominal_srate); %#ok<ST2NM>
 end    
 raw.xmin = 0;
 raw.xmax = (raw.pnts-1)/raw.srate;
@@ -105,19 +105,24 @@
 
 % events...
 event = [];
+if isfinite(stream.info.effective_srate) && stream.info.effective_srate>0
+    srate = stream.info.effective_srate;
+else
+    srate = raw.srate;
+end
 for s=1:length(streams)
     if (strcmp(streams{s}.info.type,'Markers') || strcmp(streams{s}.info.type,'Events')) && ~ismember(streams{s}.info.name,args.exclude_markerstreams)
         try
             if iscell(streams{s}.time_series)
                 for e=1:length(streams{s}.time_stamps)
                     event(end+1).type = streams{s}.time_series{e};
-                    event(end).latency = 1+raw.srate*(streams{s}.time_stamps(e)-stream.time_stamps(1));
+                    event(end).latency = 1+srate*(streams{s}.time_stamps(e)-stream.time_stamps(1));
                     event(end).duration = 1;
                 end
             else
                 for e=1:length(streams{s}.time_stamps)
                     event(end+1).type = num2str(streams{s}.time_series(e));
-                    event(end).latency = 1+raw.srate*(streams{s}.time_stamps(e)-stream.time_stamps(1));
+                    event(end).latency = 1+srate*(streams{s}.time_stamps(e)-stream.time_stamps(1));
                     event(end).duration = 1;
                 end
             end
@@ -128,6 +133,7 @@
 end
 raw.event = event;
 
+
 % etc...
 raw.etc.desc = stream.info.desc;
 raw.etc.info = rmfield(stream.info,'desc');
diff --git a/resources/sa_montreal_small.mat b/resources/sa_montreal_small.mat
index 4d6a86ec..88c660ee 100644
Binary files a/resources/sa_montreal_small.mat and b/resources/sa_montreal_small.mat differ