Finished continuous integration
merge master

* master:
  Finished continuous integration