added return void to doc block
added return type to docblock
Merge. fix conflicts.