Refactored names, edited comments.
Merge branch 'master' of https://github.com/jmlassen/dingo