Merge pull request #6 from Magenic/master

Latest Changes