Merge pull request #19 from DMagic1/dev

Version 9