MGhanem/smartsoft-13 — pull request #523 by zoheiry (2013-05-03 19:13:49+00:00)
Title: fixing conflicts

@adamggg