Merging dev up to live

This will also encapsulate the pull request from @sinker