Fixed http://sunflower.sahanafoundation.org/eden/project/task/169
Merge pull request #913 from ramdesh/sunflower

Fixed http://sunflower.sahanafoundation.org/eden/project/task/169