ndomar/megasoft-14 — pull request #577 by Eslamunto (2014-05-27 13:13:03+00:00)
Title: Bug fix#570

#570
@MohamedBassem Please review