Revert "Revert "Merge pull request #4 from midnight88/jb2""

This reverts commit 18be09c433dc099babc444f624ba8195cf3ad9f9.