Added some safeguard in case fusion can't terminate
Merge branch 'master' of https://github.com/sildar/potara