compile
changing arguments back to options
Merge branch 'master' into compile

Conflicts:
	README.md
	package.json
0.7.0