Separated infowindow init and options passed
Separated model instantiation
Merge branch 'master' into gh-pages