merged develop in to master, v1.0.1beta1
Merge branch 'master' of https://github.com/n8rzz/crispin-mulberry into develop
merged develop v1.0.1beta2
mend