refactoring, bugfixes, smartypants support
Merge branch 'master' of https://github.com/dmcnich/resolve

Conflicts:
	README.md