marked as a pre release
Merge pull request #55 from hartsock/master

marked as a pre release