License added and javadocking complete
Merged with testing!