Fixed conflict ExecutionContext refs https://twitter.com/itoasuka/status/365714977413279744
Merge pull request #45 from t2v/hotfix_conflict_ectx

Fixed conflict ExecutionContext