Merge pull request #2 from larva-lang/master

merge