Merge develop branch and add version 1.0.4