something
Merge pull request #16 from Te4ko/master

New stuff