ndomar/megasoft-14 — pull request #395 by MohamedBassem (2014-05-05 10:00:09+00:00)
Title: Bugfixes

@maisaraFarahat , please review.