FINISHED v2
Merge pull request #4 from ma3574/master

FINISHED v2