Merge pull request #47 from alexis-puska/master