Merge pull request #24 from ionscript/master

search
Merge pull request #25 from ionscript/dev

Merge pull request #24 from ionscript/master