Fix build problems for ubuntu 14.04
Polish text
Merging #26 manually