Merge branch 'dev'
proposed fix for Issue #57