Merge pull request #6 from aria4larry/develop

Merge pull request #5 from aria4larry/master
Merge pull request #7 from aria4larry/master

test