merge wercker to master