Component flag is toggled only when component is actually added.  Prevent adding a component twice
Merge pull request #428 from starwed/addComp

Change to addComponent; don't add component if it already exists.