Merge pull request #1 from wagnert/master

Refactoring