Merge pull request #8 from pollseed/develop

Develop