last changes
Merge branch '1.0.0-beta.6' of https://github.com/protreptic/smnavigator into 1.0.0-beta.6