dev branch update 14-10-31