Merge pull request #4 from Sriii/master

master to sri
gallery & face station
Merge branch 'master' into Sri's-branch
Merge branch 'master' into Sri's-branch