[Issue 34] Fixed. [Issue 37] Working on.