refactoring

refactoring
Merge branch 'master' of https://github.com/serycjon/cjf_ds