Merge pull request #1 from wardahfadil/master

added fei(wardah)
merge Fei's note into Fei(Shared)