intergrating fault handler
Merge pull request #42 from tishan89/master

intergrating fault handler