Issue Fixes for Dev master 1.0 #14
!!
Merge branch 'origin/Issue-Fix--Dev-master-1.0-(#14)'