Merge pull request #1 from igloosi/master

mergin new files