added command line switch for choosing analysis
added test to makefil