#36 Supressed some filters until an optimal solution is found.
Merge branch 'master' into issue20