Started over; PhantomJS working
Merge branch 'master' into phantomjs
Updated changes from master
Updated test
Updated README
0.6.0