initial merge
Merge pull request #1 from alexanderson/master

initial merge