Fixes #82

Sorry for this - on linux/intel it was compiling properly
Merge branch 'v2.0'