some small changes + optional restrictions on the analysis
Merge pull request #35 from spderosso/master

some small changes + optional restrictions on the analysis