posva Merge pull request #18 from Gozala/pr17