This merge closes pull request #120

https://github.com/expertiza/expertiza/pull/120 :cow: