V2.02 update
Merge pull request #2 from pbparadox/master

V2.02 update