Merge pull request #3 from berkus/master