misc code fix
Merge branch 'dev' of github.com:irgusite/aerochoulex into dev