Merge pull request #246 from hayesmg/master

Resolution to #229, #230, and #243