Bug fixes and making some of the code more flexible.
Merge branch 'master' of github.com:silentorb/bloom