Merge pull request #2 from npruis/dev

bugfix and skeleton SuspensionActivity @ErreMalote
Merge pull request #1 from ErreMalote/master

Update
Merge pull request #2 from npruis/master

Merge into master