Close Feature #85

*Close*
Feature #85
*Update*
Feature #54
Feature #59