Merge Dev to Master for 1.0.2 release