Add itos and unittest
Merge branch 'dev'