Merge pull request #6 from bau5/master

Machine work.
Test