Merge pull request #10 from jied83/jellybean

some fixes