Merge pull request #1 from serened/develop

First develop branch into master
update test and added feature from pairing session