Merge branch 'master' of https://github.com/kostia256/JustCMF