Closes #42.
Updated exception message.
Fixed #60.
Merge branch 'master' into bug-group-by-date