Updated for version 2.0.2
Merge pull request #1 from hintjens/master

Updated for version 2.0.2