updating dev branch toward 0.3