Merging master into dev

Revamp of #80