edits
Merge pull request #3 from Muntrue/Development

edits