Add changes from pull request #200
0.0.5