Fix of issue #528 with updated tests
Merge branch 'develop' of github.com:yashmehrotra/Bookie into develop