Merge pull request #534 from marcobiedermann/feature/postcss