Merge pull request #11 from zuzak/dev
Merge pull request #13 from zuzak/dev
HELPING

I AM HELPING
Merge branch 'master' into primo