Murmur optional alternative fixup

Here are my fixes for the issues #7 and #9.

The first patch is the actual fix for the issue, have a look at the commit message! The second patch is only for consistancy of the code.

Compiled and runned tests on both of the patches, worked fine. But - to be sure it works not only for me - you should run the tests anyway!

Best regards!