Merge pull request #2 from cgallitz/master

Milestone 2
Merge pull request #3 from cgallitz/release

Merge pull request #2 from cgallitz/master