validation

2014 10 2
10.20PM
Merge remote-tracking branch 'origin/Kasun'