fixed MAJOR bug
fixed merge