Issue Fixes for Dev master 1.0 #14
Merge pull request #15 from VibesAU/Issue-Fix--Dev-master-1.0-(#14)

Issue fix  dev master 1.0 (#14)