Merge pull request #6 from howland/master

Merge pull request #5 from howland/alpha0.2
Merge pull request #20 from howland/alpha0.2

Merge pull request #6 from howland/master