Merge pull request #3 from pmoosh/master

Get in some more bug fixes
Nearly Got it Working.
It is done :)