cdominik Merge pull request #31 from aluaces/patch-1