Fixed issue #51.
Fixed issue #72.
Merge pull request #73 from dmohl/master

Fixed Issues #51 and #72.