Fixes for minor issues
Merge branch 'master' of github.com:thekabal/tki