Fixed merge conflicts with PR #23