Merge pull request #22 from IanJRigg/master

getting latest
incorporated Ian's changes into my working changes
Merge pull request #96 from Ricky1833/master

Added changes in from Ian and myself