Merge pull request #8 from mysteriosum/master

My changes the past couple of days
just adding some crap
-T
Merge pull request #15 from Mchapuis/master

xcvGRWES