Added UIC
Merge pull request #258 from merqurio/master

Added UIC