Little refactor of internal data storage + Error handling fixed + Update to Jasmine 2.0