Merge pull request #822 from carlosmn/asp-pc