Merge pull request #9 from openworm/master

From M to J
Started loading from disk
Merge pull request #45 from JimHokanson/master

From J to M