Merge pull request #5 from larva-lang/master

merge