optimize
Merge pull request #42 from DaaOtt/master

optimize