fixed errors and added both option
Merge branch 'master' of github.com:howlingmad/next-fixture