MGhanem/smartsoft-13 — pull request #263 by m0hamed (2013-04-08 21:39:00+00:00)
Title: Fix master

@adamggg revert wrong merge by @adamggg