Changes 12_3_2014_2am
Merge pull request #1 from wiyow/master

Changes 12_3_2014_2am