Merge pull request #519 from rustyswayne/1.0.1

#M-207 Fixed