Merge branch 'dev' into issue_238
Merge pull request #239 from dalehenrich/issue_238

fixes for Issue 215 and Issue 221 and Issue 238