Merge pull request #36 from SunJieMing/master

Master Detail View