Bumped version.
Bumped version.
Merge develop + master branches.