fixes #15
Merge branch 'master' into #11