Merge pull request #4 from kwaping/master

Cleaned up a little