Merge pull request #10 from Magenic/master

Pull in latest changes.