changes on official
Merge pull request #1 from drunkcoder1/master

commit from fork
commit2 from fork
commit3 from fork