Code52/jibbr — pull request #35 by shiftkey (2012-01-12 12:08:58+00:00)
Title: Merging in @cyberzed's code

As @aeoth had some changes to commit and @cyberzed didn't have a chance to merge those changes, I've taken the liberty of bringing that in.