More code clean up.
Merge branch 'master' of github.com:sirdude/gurbalib