Merge pull request #29 from keikari/patch-2