Merge changes from dev

Getting ready for a release!