Update 27-3-2014

Fix some mistakes
Merge pull request #74 from Khalidsrri/master

Update 27-3-2014