Merge pull request #3 from Wevel/Development

Development