uoft-tsa/summer2012 — pull request #94 by TarekAbdelrahman (2012-06-27 11:04:06+00:00)
Title: fixed a error leading to assertion failure

Updated two files to fix the unnecessary failure of assertion. Did some cleanup to the files as well.