getting jasmine specs towork
merging previous commit