Condensation and bug fixes
Merge pull request #38 from tassiahmed/working

Condensation and bug fixes