Implemented everything.

Fixes #1 #2
Merge branch 'master' of https://github.com/helgee/testrepo