Merge pull request #66 from mjsteichen/calendar-by-month

i fixed the future
refactoring, preparing for merge to residence calendar