[Issue] Working on #57.
[Issue] Working on #57.