Merge pull request #64 from imduffy15/enhancement-#62