Merge pull request #1 from oloansembiring/grandong

20140619 Grandong Branch
20140620 collaboration
20140620 collaboration2
20140620 grandong asolole