Ver: 06/05/2013
Enhanced unit tests, fixed class naming.