format change, added toString, equals and hashCode
Merge branch 'develop'