initial commit
Merge https://github.com/ddmitov/unicnv