Updated to 1.6.1
Merge pull request #62 from emanuelschuetze/master

Updated to 1.6.1