Bugfix and findbugs fix
Merge branch 'master' of https://github.com/PatrickDeelen/systemsgenetics.git