rewritten from coffee
Merge pull request #1 from szymonkaliski/master

rewritten from coffee