First commit from home. Test. Author change.
Merge pull request #1 from benelori/test

First commit from home. Test. Author change.