Some refactorings.
Merge branch 'master' of github.com:FlaShG/GitMerge-for-Unity