dev more
Merge branch 'master' of https://github.com/gizrak/crescent.git