Merge pull request #167 from dfcoffin/master

Resolve Issues #165 and #166