Merge pull request #66 from pretenders/dev_alex

Hotfix of release 1.0
Add changelog entry.
Merge branch 'develop' of git+ssh://github.com/pretenders/pretenders into develop
Only push master.
Add ``after`` param to ``when`` method. #67