Patched to support clang++ and g++ 4.9.1 without compiler errors.
Merge pull request #2 from AndrewColes/master

Patched to support clang++ and g++ 4.9.1 without compiler errors.