Inf is Valid fix via Issue #128
Merge branch 'groovy_dev' of github.com:DLu/navigation into groovy_dev