Fixes #17
Merge pull request #18 from theodi/staff_fix

Fixes #17