add test
Merge branch 'master' of github.com:cmacro/simple

Conflicts:
	README.md