Merge pull request #25 from Gatzy118/nick

Fixed Birch merge
Added Vlad's files