Merge pull request #3 from cgrevisse/master

Placeholder