diff --git a/matlab/Map.m b/matlab/Map.m
index b36713b..e3f960e 100644
--- a/matlab/Map.m
+++ b/matlab/Map.m
@@ -26,13 +26,13 @@ classdef Map
         function map = Map(size_pixels, size_meters)
             % Map creates an empty square map
             %     map = Map(size_pixels, size_meters)
-            map.c_map = mex_coreslam('Map_init', size_pixels, size_meters);
+            map.c_map = mex_breezyslam('Map_init', size_pixels, size_meters);
             
         end
         
         function disp(map)
             % Displays data about this map
-            mex_coreslam('Map_disp', map.c_map)
+            mex_breezyslam('Map_disp', map.c_map)
             
         end
         
@@ -40,7 +40,7 @@ classdef Map
             % Updates this map with a new scan and position
             %
             %     update(map, scan, new_position, map_quality, hole_width_mm)
-            mex_coreslam('Map_update', map.c_map, scan.c_scan, new_position, int32(map_quality), hole_width_mm)
+            mex_breezyslam('Map_update', map.c_map, scan.c_scan, new_position, int32(map_quality), hole_width_mm)
             
         end
         
@@ -50,7 +50,7 @@ classdef Map
             %     bytes = get(map)
             
             % Transpose for uniformity with Python, C++ versions
-            bytes = mex_coreslam('Map_get', map.c_map)';
+            bytes = mex_breezyslam('Map_get', map.c_map)';
             
         end
         
diff --git a/matlab/RMHC_SLAM.m b/matlab/RMHC_SLAM.m
index d146de9..0062574 100644
--- a/matlab/RMHC_SLAM.m
+++ b/matlab/RMHC_SLAM.m
@@ -45,7 +45,7 @@ classdef RMHC_SLAM < SinglePositionSLAM
                 random_seed = floor(cputime) & hex2dec('FFFF');
             end
             
-            slam.c_randomizer = mex_coreslam('Randomizer_init', random_seed);
+            slam.c_randomizer = mex_breezyslam('Randomizer_init', random_seed);
             
         end
         
@@ -55,7 +55,7 @@ classdef RMHC_SLAM < SinglePositionSLAM
             %    better position based on a starting position.
                                                
             [new_pos.x_mm,new_pos.y_mm,new_pos.theta_degrees] = ...
-            mex_coreslam('rmhcPositionSearch',  ...
+            mex_breezyslam('rmhcPositionSearch',  ...
                 start_pos, ...
                 slam.map.c_map, ...
                 slam.scan_for_distance.c_scan, ...
diff --git a/matlab/Scan.m b/matlab/Scan.m
index 17fad78..4845738 100644
--- a/matlab/Scan.m
+++ b/matlab/Scan.m
@@ -41,14 +41,14 @@ classdef Scan
               span = 1;
           end
                     
-          [scan.c_scan, scan.c_laser] = mex_coreslam('Scan_init', laser, span);
+          [scan.c_scan, scan.c_laser] = mex_breezyslam('Scan_init', laser, span);
                               
       end 
       
       function disp(scan)
           % Displays information about this Scan
           
-          mex_coreslam('Scan_disp', scan.c_scan)
+          mex_breezyslam('Scan_disp', scan.c_scan)
          
       end 
       
@@ -59,7 +59,7 @@ classdef Scan
           %    hole_width_mm is the width of holes (obstacles, walls) in millimeters.
           %    velocities is an optional list[dxy_mm, dtheta_degrees]
           %    i.e., robot's (forward, rotational velocity) for improving the quality of the scan.
-          mex_coreslam('Scan_update', scan.c_scan, scan.c_laser, int32(scans_mm), hole_width_mm, velocities)
+          mex_breezyslam('Scan_update', scan.c_scan, scan.c_laser, int32(scans_mm), hole_width_mm, velocities)
       end
       
    end
diff --git a/matlab/make.m b/matlab/make.m
index 67798f4..b00df47 100644
--- a/matlab/make.m
+++ b/matlab/make.m
@@ -16,4 +16,4 @@
 %    along with this code.  If not, see <http:#www.gnu.org/licenses/>.
 
 
-mex mex_coreslam.c ../c/coreslam.c ../c/coreslam_sisd.c ../c/random.c ../c/ziggurat.c
+mex mex_breezyslam.c ../c/coreslam.c ../c/coreslam_sisd.c ../c/random.c ../c/ziggurat.c
diff --git a/matlab/mex_breezyslam.c b/matlab/mex_breezyslam.c
new file mode 100644
index 0000000..ad2d193
--- /dev/null
+++ b/matlab/mex_breezyslam.c
@@ -0,0 +1,300 @@
+/*
+ * mex_breezyslam.c : C extensions for BreezySLAM in Matlab
+ *
+ * Copyright (C) 2014 Simon D. Levy
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This code 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 Lesser General Public License
+ * along with this code.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mex.h"
+
+#include "../c/coreslam.h"
+#include "../c/random.h"
+
+#define MAXSTR 100
+
+/* Helpers ------------------------------------------------------------- */
+
+static int _streq(char * s, const char * t)
+{
+    return !strcmp(s, t);
+}
+
+static void _insert_obj_lhs(mxArray *plhs[], void * obj, int pos)
+{    
+    long * outptr = NULL;
+    
+    plhs[pos] = mxCreateNumericMatrix(1, 1, mxINT64_CLASS, mxREAL);
+
+    outptr = (long *) mxGetPr(plhs[pos]);
+    
+    mexMakeMemoryPersistent(obj);
+    
+    *outptr = (long)obj;
+}
+
+static double _get_field(const mxArray * pm, const char * fieldname)
+{
+    mxArray  * field_array_ptr = mxGetField(pm, 0, fieldname);
+    
+    return mxGetScalar(field_array_ptr);
+}
+
+static long _rhs2ptr(const mxArray * prhs[], int index)
+{
+    long * inptr = (long *) mxGetPr(prhs[index]);
+    
+    return *inptr;
+}
+
+static scan_t * _rhs2scan(const mxArray * prhs[], int index)
+{
+    long inptr = _rhs2ptr(prhs, index);
+    
+    return (scan_t *)inptr;
+}
+
+static map_t * _rhs2map(const mxArray * prhs[], int index)
+{
+    long inptr = _rhs2ptr(prhs, index);
+    
+    return (map_t *)inptr;
+}
+
+static position_t _rhs2pos(const mxArray * prhs[], int index)
+{
+    position_t position;
+    
+    position.x_mm          = _get_field(prhs[index], "x_mm");
+    position.y_mm          = _get_field(prhs[index], "y_mm");
+    position.theta_degrees = _get_field(prhs[index], "theta_degrees");
+    
+    return position;
+}
+
+static void _rhs2laser(laser_t * laser, const mxArray * prhs[], int index)
+{
+    laser->scan_size =           (int)_get_field(prhs[index], "scan_size");
+    laser->scan_rate_hz =             _get_field(prhs[index], "scan_rate_hz");
+    laser->detection_angle_degrees =  _get_field(prhs[index], "detection_angle_degrees");
+    laser->distance_no_detection_mm = _get_field(prhs[index], "distance_no_detection_mm");
+    laser->detection_margin =    (int)_get_field(prhs[index], "detection_margin");
+    laser->offset_mm =                _get_field(prhs[index], "offset_mm");
+}
+
+/* Class methods ------------------------------------------------------- */
+
+static void _map_init(mxArray *plhs[], const mxArray * prhs[])
+{
+    
+    int size_pixels = (int)mxGetScalar(prhs[1]);
+    
+    double size_meters = mxGetScalar(prhs[2]);
+    
+    map_t * map = (map_t *)mxMalloc(sizeof(map_t));
+    
+    map_init(map, size_pixels, size_meters);
+    
+    _insert_obj_lhs(plhs, map, 0);
+}
+
+static void _map_disp(const mxArray * prhs[])
+{
+    char str[MAXSTR];
+    
+    map_t * map = _rhs2map(prhs, 1);
+    
+    map_string(*map, str);
+    
+    printf("%s\n", str);
+}
+
+static void _map_update(const mxArray * prhs[])
+{
+    map_t  * map  = _rhs2map(prhs, 1);
+    
+    scan_t * scan = _rhs2scan(prhs, 2);
+    
+    position_t position = _rhs2pos(prhs, 3);
+    
+    int map_quality = (int)mxGetScalar(prhs[4]);
+    
+    double hole_width_mm = mxGetScalar(prhs[5]);
+    
+    map_update(map, scan, position, map_quality, hole_width_mm);
+}
+
+static void _map_get(mxArray *plhs[], const mxArray * prhs[])
+{
+    map_t * map  = _rhs2map(prhs, 1);
+   
+    unsigned char * pointer = NULL;
+    
+    plhs[0] = mxCreateNumericMatrix(map->size_pixels, map->size_pixels,
+            mxUINT8_CLASS, mxREAL);
+    
+    pointer = (unsigned char *)mxGetPr(plhs[0]);
+        
+    map_get(map, pointer);
+}
+
+
+static void _scan_init(mxArray *plhs[], const mxArray * prhs[])
+{
+    
+    laser_t * laser = (laser_t *)mxMalloc(sizeof(laser_t));
+    
+    scan_t * scan = (scan_t *)mxMalloc(sizeof(scan_t));
+    
+    int span = (int)mxGetScalar(prhs[2]);
+    
+    _rhs2laser(laser, prhs, 1);
+    
+    scan_init(scan, laser->scan_size, span);
+            
+    
+    _insert_obj_lhs(plhs, scan, 0);
+    _insert_obj_lhs(plhs, laser, 1);
+}
+
+static void _scan_disp(const mxArray * prhs[])
+{
+    char str[MAXSTR];
+    
+    scan_t * scan = _rhs2scan(prhs, 1);
+    
+    scan_string(*scan, str);
+    
+    printf("%s\n", str);
+}
+
+static void _scan_update(const mxArray * prhs[])
+{
+    scan_t * scan = _rhs2scan(prhs, 1);
+    
+    laser_t * laser = (laser_t *)_rhs2ptr(prhs, 2);
+    
+    int scansize = (int)mxGetNumberOfElements(prhs[3]);
+    
+    int * lidar_mm = (int *)mxGetPr(prhs[3]);
+    
+    double hole_width_mm = mxGetScalar(prhs[4]);
+    
+    double * velocities = mxGetPr(prhs[5]);
+    
+    scan_update(scan, lidar_mm, *laser, hole_width_mm, velocities[0], velocities[1]);
+}
+
+static void _randomizer_init(mxArray *plhs[], const mxArray * prhs[])
+{
+    int seed = (int)mxGetScalar(prhs[1]);
+    
+    void * r = mxMalloc(random_size());
+    
+    random_init(r, seed);
+    
+    _insert_obj_lhs(plhs, r, 0);
+}
+
+static void _rmhcPositionSearch(mxArray *plhs[], const mxArray * prhs[])
+{
+    position_t start_pos = _rhs2pos(prhs, 1);
+    
+    map_t * map = _rhs2map(prhs, 2);
+    
+    scan_t * scan = _rhs2scan(prhs, 3);
+    
+    laser_t laser;
+    position_t new_pos;
+    
+    double sigma_xy_mm = mxGetScalar(prhs[5]);
+    
+    double sigma_theta_degrees = mxGetScalar(prhs[6]);
+    
+    int max_search_iter = (int)mxGetScalar(prhs[7]);
+    
+    void * randomizer = (void *)(long)mxGetScalar(prhs[8]);
+    
+    _rhs2laser(&laser, prhs, 4);
+    
+    new_pos =  rmhc_position_search(
+            start_pos,
+            map,
+            scan,
+            laser,
+            sigma_xy_mm,
+            sigma_theta_degrees,
+            max_search_iter,
+            randomizer);
+    
+    plhs[0] = mxCreateDoubleScalar(new_pos.x_mm);
+    plhs[1] = mxCreateDoubleScalar(new_pos.y_mm);
+    plhs[2] = mxCreateDoubleScalar(new_pos.theta_degrees);
+}
+
+/* The gateway function ------------------------------------------------ */
+void mexFunction( int nlhs, mxArray *plhs[],
+        int nrhs, const mxArray * prhs[])
+{
+   
+    char methodname[MAXSTR];
+    
+    mxGetString(prhs[0], methodname, 100);
+
+    if (_streq(methodname, "Map_init"))
+    {
+        _map_init(plhs, prhs);
+    }
+    
+    else if (_streq(methodname, "Map_disp"))
+    {
+        _map_disp(prhs);
+    }
+    
+    else if (_streq(methodname, "Map_update"))
+    {
+        _map_update(prhs);
+    }
+    
+    else if (_streq(methodname, "Map_get"))
+    {
+        _map_get(plhs, prhs);
+    }
+    
+    else if (_streq(methodname, "Scan_init"))
+    {        
+        _scan_init(plhs, prhs);
+    }
+    
+    else if (_streq(methodname, "Scan_disp"))
+    {
+        _scan_disp(prhs);
+    }
+    
+    else if (_streq(methodname, "Scan_update"))
+    {
+        _scan_update(prhs);
+    }
+    
+    else if (_streq(methodname, "Randomizer_init"))
+    {
+        _randomizer_init(plhs, prhs);
+    }
+    
+    else if (_streq(methodname, "rmhcPositionSearch"))
+    {
+        _rmhcPositionSearch(plhs, prhs);
+    }
+}
+
diff --git a/matlab/mex_breezyslam.mexa64 b/matlab/mex_breezyslam.mexa64
new file mode 100755
index 0000000..adaa9db
Binary files /dev/null and b/matlab/mex_breezyslam.mexa64 differ
diff --git a/matlab/mex_breezyslam.mexmaci64 b/matlab/mex_breezyslam.mexmaci64
new file mode 100644
index 0000000..97fc14b
Binary files /dev/null and b/matlab/mex_breezyslam.mexmaci64 differ
diff --git a/matlab/mex_breezyslam.mexw64 b/matlab/mex_breezyslam.mexw64
new file mode 100644
index 0000000..28bdc0a
Binary files /dev/null and b/matlab/mex_breezyslam.mexw64 differ