Merge pull request #4 from Magenic/master

Recent changes.
Merge pull request #25 from Bowman74/master

Merge pull request #4 from Magenic/master