Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge pull request #24 from wilas/stable

Stable