Merge pull request #24 from ionscript/master

search