Updated comments to credit original author