nolonger create files directly via phantomjs
Merge origin/master