Merge fix for issue 18
fixed issue 19
Merge branch 'issue19' into dev