ACTUAL fix for #8

Three cheers for functional testing not only exposing an intermittent bug, but helping to track it down and prove it was fixed.
Merge branch 'master' of https://github.com/devgeeks/Encryptr