ndomar/megasoft-13 — pull request #196 by ahmadsoliman (2013-04-06 11:45:21+00:00)
Title: Revert samy revert

Resolving master conflicts