misc
Merge pull request #2 from jimmont/jimmontfeat2

misc