Merge pull request #2 from cgallitz/master

Milestone 2