updated for v2.0.0_rc1

see change log for full description
Merge pull request #2 from dcsale/master

updated for v2.0.0_rc1