Merge pull request #4 from klyksl2012/fc

fc
update master5
update master6
fe1
fe2
Merge pull request #3 from klyksl2012/fe

merge fe