added type decalrations to some vars to prevent compiler warnings.
Merge remote-tracking branch 'origin/dev' into dev