Merge pull request #71 from KSHSK/knockout

Knockout
Merge branch 'master' into enums