merge Dev into master 

Version 0.2.1