Merge pull request #147 from azonenberg/master