Updated to include navigation variables
Merge pull request #25 from adaptlearning/issue/#24

Updated to include navigation variables