1.3.1

Bugfix and markup changes