Merge pull request #5 from dschen/master

Merge branch 'master' into dschen
Merge pull request #6 from dschen/dschen

Merge pull request #5 from dschen/master