Dev

Sync dev and master before starting on waffle.io tickets