Merge pull request #6 from k3ll4gr0up/master

Merge master to nico
Merge pull request #11 from k3ll4gr0up/nico

Merge pull request #6 from k3ll4gr0up/master