Merge branch 'master' of https://github.com/kjoehass/fxopt

Conflicts:
	README.md

Signed-off-by: K. Joe Hass <kjoehass@yahoo.com>