Merge Dev to master module 1.0.4