made changes
Merge pull request #3 from BObereder/development

made weak optional