Merge dev to master for first deploy