Merge pull request #33 from makije/master

Extension