second commit
Merge pull request #1 from nlillie/alpha

second commit