all dev work done since dev start till 0718
Merge branch 'master' of https://github.com/iggytheiguana/BL056