Merge pull request #17 from xeno-by/master

hAcKaThOn 2014-04-15