2.0.2 updates
Merge pull request #23 from khawkins/202_update

2.0.2 updates