Better error handling
Bump versions
Merge pull request #1 from asafyish/master

Pull Request