added a cool_feature branch
rebased cool_feature onto master