Merge pull request #48 from StanculescuDaniel/master

Addresses and incidents are now list of strings
Removed superfluous ToString()s

and other small refactorings
Cosmetic refactorings
Conflicts modofications