Removed some debugging code.
Merge origin/master
Some method name changes.