Catch up develop with master in prep for first release