final update before release
Merge pull request #3 from Tjoosten/Development

final update before release