lot of stuff
Merge pull request #15 from miki9938/master

qweqweqweqwe