Merge pull request #303 from ermshiperete/5278