Converted to Ember CLI addon
merge changes