Added toString implementation
Merge branch 'dev'