Fix bugs
Merge branch 'master' of https://github.com/X54329/Layers