Merge develop into master

Merge recent developments into master :

• Work towards #37 (closed)
• Closes #36 (closed)