ndomar/megasoft-13 — pull request #346 by SarahNouh (2013-05-06 18:06:22+00:00)
Title: Fixing some bugs

@kimoktm