Merge pull request #23 from kzhen/master

Colspan for loading message