Added basic Initialization function.
Merge origin/master