Merge pull request #35 from mysteriosum/master

bleh
pushing line on floor for U
Signed-off-by: Mchapuis <machapu@gmail.com>
Merge pull request #44 from Mchapuis/master

just a pull nbd