Merging master

Supersede #71