More tests and stuff.
Merge branch 'master' of github.com:rubenvb/KISS