Dialyzer messages fixed.
Merge branch 'test' into dev