done with feature ==> changed comments
Merge pull request #1 from pawsen/cool_features

done with feature ==> changed comments