Merge pull request #30 from k3oni/master

update dev from master
Merge pull request #32 from k3oni/master

dev pull
Merge pull request #34 from k3oni/dev

Dev