Dev

Merge Dev -> Master as the dev version is about to be published to the App Store.