Merge pull request #6 from toreae/Develop

add feature
Merge pull request #7 from toreae/master

Merge pull request #6 from toreae/Develop