unwanted commit

Merge pull request #11