Update versions and minor clean-up
Merge pull request #3 from tremes/my-1.1

Version updates