changes based on jan's comments
Merge pull request #5 from Medvise/aw-jan-comments

changes based on jan's comments