commit before merging with core
Merge pull request #20 from Gegga87/master

commit before merging with core