rollback to 1.0.1 due to problems
Merge pull request #261 from zelgerj/master

rollback to 1.0.1