Merge pull request #6 from israelidanny/upstream-fixes

Implementing afterGet
afterGet option documented
Merge remote-tracking branch 'punkave/master' into i18n
Refactoring i18n