#82
Merge pull request #95 from nikezono/82_djaoi

#82