SNAPSHOT
Merge branch 'master' into develop
Changed FactoryGirl APIs
Updated readme
version 0.9.4
Merge branch 'release/0.9.4'