Merge pull request #83 from JimmyThompson/master

Further Fix as per #76