dev
Merge pull request #1 from mmurrell/master

BugFix 123