fixes
Merge pull request #1 from NordicLight/dev

fixes