Merge branch 'hotfix-1.0.2'
renamed dict param so as to not shadow builtin method
modified readme
updated setup.py
Merge branch 'hotfix-1.0.3' into develop