Merge pull request #1 from Tux2/master

Merge with Latest dev build