Merge pull request #10 from kalua85/master

Dev
Merge pull request #11 from kalua85/master

3
update
Merge pull request #12 from kalua85/dev

static update