Add FEMUG-CE

Resolving some merge problems from @dancasttro and merging to the master.

Also, I think this fix #4 and #11