tidy
Merge pull request #1 from zuzak/master

tidy