Merge pull request #11 from skaldarnar/master

New Quern shape and some fixes
Reapplying the changes.