[Issue] Working on #36. [Notes] Updated.