Added new CLI option and ember-support

See issue #19 and PR #25

Sorry that I had to create a new PR, but I could not squash the other one. Made the requested fixed/changes though.