Merge pull request #42 from berkus/master