Fix for #113, #114, and #55

This time including unit tests
Also updated FCS to 0.20