Re-factored to simplify, improve speed and publish to public directory
Bump version to v2.0.0 (2014-08-08)