Merge branch 'master' of https://github.com/feskehau/Scarecrow.git