merged in master into gh-pages was that a smart thing to do???
test