Merge Dev to Master

Fix #3 
Fix #4