Merge pull request #11 from korczis/master

Merge Master to Stable
Merge pull request #12 from korczis/master

Merge Master to Stable
Merge pull request #13 from korczis/master

Merge Master to Stable
Merge pull request #14 from korczis/master

Merge Master to Stable
Merge pull request #15 from korczis/master

Merge Master to Stable
Merge pull request #16 from korczis/master

Merge Master to Stable
Merge pull request #17 from korczis/master

Stable
Merge pull request #18 from korczis/stable

Stable