Merge pull request #4 from truepl/master

Fixes
improv: important dates
Everything is refactored :)