Merge pull request #1 from DariusIII/dev

adding new stuff