merging develop into crichton demo

merging latest changes into crichton demo

please review... thanks!