Fixing dialyzer warnings.
Fixed identation.
Merge branch 'test' into dev