Merge pull request #2 from nc6/master

Pull to version 0.2.1.0