Merge branches 'Dev' and 'Stable' into Stable
Merge pull request #3 from mortie/Stable

Merge branches 'Dev' and 'Stable' into Stable