Updated to work on lab machines
Merge pull request #6 from wyager/master

Updated to work on lab machines