Added the initialization method. Some more sweet help.
Merge remote-tracking branch 'origin/master'