Merge pull request #25 from k3ll4gr0up/master

GET MEH DA BAHSE
Merge pull request #27 from k3ll4gr0up/lukas

Merge pull request #25 from k3ll4gr0up/master