almost done
Merge branch 'develop' of https://github.com/alexandrucom/Clamber into develop