Merge pull request #85 from alexis-puska/master_merged