do not use dev-master
Merge pull request #4 from garak/patch-1

do not use dev-master
Merge remote-tracking branch 'upstream/master'