Bug fixes (fixes issue 20, fixes issue 22)

Resolves https://github.com/rcbops/djeep/issues/20
Resolves https://github.com/rcbops/djeep/issues/22