Version 2.0
Merge pull request #2 from ecomstyle/master

Version 2.0