Unit tests done.
Merge branch 'master' of https://github.com/Darkmer/masterchief