Merge pull request #12 from RobinvdVleuten/master

Made the bundle compatible with SF 2.3+