Dropping calendar suffix

closes #29
Tests are ok. I've tried to trim the docstrings a bit, too.