#199 Merge changes from Kevin
#197 Correct location of comment to avoid compile warning.