Merge pull request #12 from starverte/v1.2.1-bugs

Merge from master
Increase version numbers
Merge pull request #160 from mbeall/master

Increase version numbers and update changelog