double underscore for private methods
Merge branch 'tczekajlo-master'
History for CLI