Merged FN library
Fixed #830