ndomar/megasoft-14 — pull request #546 by mansoursaid001 (2014-05-16 18:08:19+00:00)
Title: Issue #544 - fixing bugs

Issue #544