kiwidoggie Merge pull request #2 from OpenOrbis/feature/refactor1_2 …