Merge pull request #8 from stoewer/master

Okay.
Merge upstream/master into local master
Conference: add companion object
Figure: add companion object
Merge branch 'development'