Module update
Merge branch 'master' of https://github.com/milesblackwood/kmb-public
Merge in changes