Merge pull request #154 from bamaer/master