Fix #35 (committing on this branch to avoid the merge conflict later)