Merge pull request #4 from saukko/master
authorJF Ding <jfding@gmail.com>
Fri, 16 Dec 2011 07:31:29 +0000 (23:31 -0800)
committerJF Ding <jfding@gmail.com>
Fri, 16 Dec 2011 07:31:29 +0000 (23:31 -0800)
Some updates for naming


Trivial merge