Merge pull request #13 from iar42/patch-1