added tests and stuff - jmac
Merge branch 'agnerrl'