implemented some of the feedback
Merge pull request #94 from SvenDowideit/implement-some-feedback

implemented some of the feedback