Merging PR #302