ass etc fixed
Merge pull request #10 from s10018/mai-om

ass etc fixed