refactored code
Merge branch 'develop' of https://github.com/nyus2014/CIU into develop
refactored code. and added support for ios 8