Merge pull request #33 from Gegga87/master

fake offline
..
Dat refactor right before deadline.. mmmmmmhm so much fun.
..
..
..
..
..
..
..
..