Merge pull request #17 from adamdiy/adam-cleaning

Adam cleaning
Revert "Adam cleaning"
Merge pull request #18 from adamdiy/revert-17-adam-cleaning

Revert "Adam cleaning"
out