Merge pull request #1 from a85/master

Sync
Merge pull request #2 from a85/master

merge
Fix for css issue
Merge pull request #708 from abhijitkane/master

CSS fix