TODO update
Add some unit test
Merge branch 'develop' of https://github.com/Komrod/yespix into develop