Incorporate changes from googlecode

This pull closes #3.