Merge pull request #49 from berq/master