issue 40 and 41

Christian,
still code needs  to be formated but maybe you can format it since updating checkstyle config to be more environment agnostic may take you some time