Merge pull request #1202 from jpereira/dict/boingo