ALMOST FINISHED\! FUCK IT\!
Merge pull request #7 from chikim/develop

ALMOST FINISHED\! FUCK IT\!