Fix for #196
compiling fix for #196
Merge branch 'master' into gh-pages