Navigation issue #216 solved
Merge pull request #218 from shinesoftware/sandbox

Navigation issue #216 solved