keijiro Merge pull request #3 from keijiro/upm