Revert "Revert "Merge pull request #327 from camjknight/master""

This reverts commit 41c430deeb1ce36bff5de589de64991b524ddac1.