Update system
Merge pull request #18 from Kristories/2.0

Update system