Merge pull request #1 from PAC-man/jellybean

i make some wrong changes for jellybean branch so im now calling it backup