Merged in changes from @chbeer, fixes #28.