added; test for #38
Merge branch 'master' into gh-pages