Fixed #20
Merge branch 'master' of github.com:dsprenkels/kn-next