Fix redundancies and make it more OOP like
Merge branch 'master' of https://github.com/bucifer/navctrl