This fixes #2 and fixes #3
Merge branch 'master' of https://github.com/centideo/bolt