Issues/36

@kinoshitato please review