Merge remote-tracking branch 'upstream/master'
dictionarys done
Merge pull request #66 from lewenhagen/master

dictionaries done