regisjorda/CPS_630 — pull request #20 by regisjorda (2013-03-15 04:00:34+00:00)
Title:  Update, Merged Fadi's code

Manually