Dev

Merge development changes into the master branch