Commited #468 after modification bug.
Merge branch 'master' of https://github.com/endosnipe/ENdoSnipe
Commited #470 after modification bug, CD format.
Commited #470 by adding cleanup and codeformat.
Merge pull request #471 from acro-pin/issues_470

Pull Request Issues #470.