Merge branch 'master' into bugfix
Issue #25
Issue #25
Merge branch 'bugfix'