Edited .. development
Fixed stagin bugs in develop branch.