Merge pull request #12 from watabou/1.7.2

1.7.2