Merge pull request #122 from isflorin/dev

Merge pull request #121 from isflorin/master
Merge pull request #123 from isflorin/dev

update
Merge pull request #124 from isflorin/dev

Update
Update
Merge branch 'master' of https://github.com/isflorin/boomin
Merge pull request #125 from isflorin/master

merge master