added != operators too
Merge branch 'feature/Input' into develop