Deployed: Merge pull request #195 from Cleasto/master

generated from commit fc6164033f7cdb7c9c8a179608ff73f4afd993e2