Merge version 1.3.1 into master

Fixed layout:

* smaller type
* more space