Merge pull request #139 from thecodingmachine/landingpage