closes #20
version bump
Merge pull request #21 from robweber/master

Update Frodo branch