DevYah/coolsoft-13 — pull request #303 by mahmoudhashish (2013-05-03 17:54:09+00:00)
Title: Issue #234 Fix tests to pull up with master updates

Issue #234
@omar-kassem please review to merge with master