Feature/issues/56 #57

Closed azzrhoshino closed 5 years ago