Clean up.
Merge remote-tracking branch 'upstream/master'
Merge pull request #46 from shadc/master

Cleaned up...