Commited #441 after modification bug.
Merge pull request #442 from acro-pin/issues_441

Pull Request Issues #441
Commited #423 after modification bug.
Commited #423 after delete comment
Merge pull request #443 from acro-pin/issues_423

Pull Request issues #423.