Initial concept improvements
Merge branch 'master' of https://github.com/KrzysztofWrobel/MasterThesis