Code refactoring
Merge branch 'master' of github.com:far-rel/voyager1