Adding new feature related to #16
Fix for #16
Updating version name
Merge branch 'develop'