Merge pull request #83 from JN-Jones/feature

Cherry Picking old Pull Requests