Fixed #2

Fixed the #2 (closed) issue as well as some minor improvements.

Merge request reports

Loading