Merge pull request #12 from Dagal/Dagal

Dagal
Merge pull request #14 from Dagal/Working

Merge pull request #12 from Dagal/Dagal