Corrected earlier bugs
Merge pull request #3 from CobyGoldbergs/master

Corrected earlier bugs