Merge pull request #28 from k3ll4gr0up/master

update lukas
Merge pull request #39 from k3ll4gr0up/lukas

Merge pull request #28 from k3ll4gr0up/master