Merge pull request #9 from JN-Jones/development

Some Improvements