Merge Dev with Master

Updating to version 2.0