Merge pull request #37 from k3ll4gr0up/master

Go up to d8!
Merge pull request #40 from k3ll4gr0up/nico

Merge pull request #37 from k3ll4gr0up/master