Properties management and proper port handling
Cleanup and fixes
Merge branch 'master' of github.com:robotbrain/apoapsis