Merge pull request #110 from bamaer/master