Merge pull request #58 from athahar/master

Bram's css code changes
Merge pull request #59 from athahar/develop

Merge pull request #58 from athahar/master