updates
Merge branch 'paul' of https://github.com/pfletch1023/Gandalf into paul