Dev

Merging dev branch into master repo