Quiver update 2
Merge pull request #33 from amedw/master

Quiver update 2