update master4
fc
Merge pull request #2 from klyksl2012/fc

merge fc