Maintenance 1.0.x

Merge bug fix branch into master branch