m-531
Merge pull request #17 from dfberry/master

m-531