Merge pull request #6 from toreae/Develop

add feature