Merge branch 'perttufix'
Merge branch 'perttufix'
Done Milestone 1.1.1
Merge pull request #16 from ristinolla/milestone-1.1.1

Milestone 1.1.1