Revert "Revert "Merge pull request #1 from iori-o/aaa""

This reverts commit b97f9708cdfd9b9065be69cc568a30ea6f4c3dc5.