Upgraded
Merge pull request #124 from leonkunert/master

Upgraded