fixed problems with dev branch