Merge pull request #36 from pondering/master

mv
mv
Merge pull request #37 from spininertia/master

mv