Merge pull request #28 from k3ll4gr0up/master

update lukas