[Issue #31] Working on.