version 2.0
add unit test
Merge pull request #1 from theelphie/develop

Version 2.0