Using better API and calls
Merge remote-tracking branch 'ferjm/master'

* ferjm/master:
  Add bootstrap