Code cleaning
Fix search method
Merge pull request #11 from Yukariin/master

Apply cleaning