staeiou Merge pull request #241 from cifkao/master