kikito Merge pull request #27 from rm-code/patch-1