more updates
Merge pull request #1 from Minasokoni/additions

more updates