Merge pull request #90 from DMagic1/dev

V9 rc2