Loading time optimised
Merge pull request #78 from kaustabh/master

Loading time optimised