Merge branch 'maun-master'. Fixes PR #4.