Updated
Merge pull request #22 from Kristories/master

Update