Merge pull request #7 from chikim/develop

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

DONE
truly - madly - deeply - fuck it off - yeah