Merge master in test + fix karma setup -- Related to #7