Revert "Merging in developemnt branch"

This reverts commit f50611ed8693dba420bc4308a89c56d3eb5fafce.