Jasmine2.0

PR #30 but for the correct branch.