FL's mathbox update
merge FL changes
master as of 24-Dec-2013