Merge pull request #2 from mortie/Dev

fixed last fix
Merge branch 'Dev' into Stable