Fixed issue with wrong default value
Unnecessary condition
Fixed unresolved conflict
Merge pull request #16 from joymax/master

Fixed issue with default value for Dict key