Unit test improvement + code improvement
Merge pull request #9 from fezfez/alpha-0.1

Unit test improvement + code improvement