Deployed: Merge pull request #187 from Cleasto/master

generated from commit ceb29f8feb2079a56dd2f641cf36e9908475fbbe