Merge pull request #3 from cjandayan/MSS-1054

MSS 1054 First PR