Changed licence headers to Apache 2 Licence.
Completed JavaDoc, added toString methods.