refactoring part I
refactoring part II
Merge branch 'master' of https://github.com/RavenNevermore/Omnom-III