Fixed bugs
Merge pull request #1 from schartier/schartier/workCopy

Fixed bugs