Merge pull request #530 from Tendrid/develop

Develop
stacked column