Improved.
Merge branch 'master' into hello-world
Fixed after merge.
Removed redundant classes and resources.