fixed null pointer problem by initializing lists in constructors
Merge branch 'master' of https://github.com/akmadsen/sisyphus1.git