Merge pull request #4 from zonuexe/develop

Devide test file
Merge branch 'develop'
Merge branch 'develop'
fixup #6