Merge pull request #6 from Saiyan/dev

bunch of changes