More :)
Merge pull request #1 from htchoi1995/jb-mr1

More :)