Implemented tb04ad
Merge remote-tracking branch 'jcrist/master'

Conflicts:
	README.md