408 ember part 1
Merge pull request #118 from williamherry/408-ember-part-1

408 ember part 1＃96