Adjusting to fit UnBiquitous/uos_core/refactoring_uos_initializer branch
Merge pull request #6 from UnBiquitous/refactoring_uos_initializer

Adjusting to fit UnBiquitous/uos_core/refactoring_uos_initializer branch