manually Merge with powerstk patch10

Merge for pull request  Patch 10 #81

Please make your code merged by kdiff otherwise no longer possible to
merge because in your files are some parts missing (Module Patch and
BONUS Task)