Testing pull request.
Merge pull request #2 from Offlein/master

Testing pull request.