add support for fork loop detection
version 0.8.1
Merge branch 'development/master' into master/master