Fix
Fix
Merge branch 'master' of git://github.com/epigrams/shifter into epigrams-master

Conflicts:
	README.md
Merge branch 'master' of github.com:alexandru/shifter