Implemented US#14 and US#15

Preview PullRequest for triggering the Buildserver