Fix for issue 4
Fix for issue 3
Merge branches 'issue3' and 'issue4' into dev_1.1