Fixes
Merge branch 'dev' of github.com:Photress/PhotressOnSails into dev