Merge pull request #81 from leokraemer/develop

All branches together, exept phil, you better clone again
merged with spss13