Merge pull request #9 from whitequark/master