removed silly init method. instances are create on the fly now
Merge remote-tracking branch 'upstream/master'