Merge pull request #51 from alexis-puska/master