Merge pull request #8 from fromradio/pr/7

Pr/7