Merge pull request #10 from Magenic/master

Pull in latest changes.
Merge pull request #40 from Bowman74/master

Merge pull request #10 from Magenic/master