refactoring
Merge branch 'master' of github.com:saggann/com.adastra.haguemarine