bug fix number one$
resolveed bug merge master
resolveed bug merge master