Merge pull request #4 from Magenic/master

Recent changes.