Implement recommended changes regarding Omoshiro

This commit implements changes recommended in issue #146.