clean code
Merge pull request #83 from DF1E/master

clean code