Squashed commit of the following:

commit 6ec5bbdfc935b4ec0eca60a1c08ace02db62952d
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Apr 8 19:29:20 2013 +0200

    Fixed #21
Merge branch 'darkrpFPP' of github.com:FPtje/Falcos-Prop-protection into darkrpFPP