Did some stuff
Merge pull request #17 from spirnuise/master

Finished requirements!