FINISHED
Merge pull request #3 from ma3574/master

FINISHED