Merge pull request #10 from jied83/jellybean

some fixes
Merge pull request #2 from PantechDevTeam/jellybean

Merge pull request #10 from jied83/jellybean