Dev

Merging latest changes into master.