Fixes #50 - fixing issues with GCC