Fixes #15.
Merge branch 'glavin' into develop