Added const qualifiers to appropriate methods
Merge branch 'master' into JamieEvents