Merge pull request #11 from nselikoff/dev

Updated to 2.0.2+16391