Made compatible with Bolt 2.0 development.
Merge pull request #1 from pvankouteren/master

Made compatible with Bolt 2.0 development.