Updating to current version
Fixed problems
Merge pull request #21 from chrisbenda/master

Pull request