Merge pull request #1 from zokeber/dev

Dev
Merge pull request #2 from zokeber/master

Merge pull request #1 from zokeber/dev