hvesalai Merge pull request #179 from fommil/organise