wip
Merge branch 'develop' of https://github.com/evandor/skysail into develop
wip