prepping for merge

Signed-off-by: fallenangelX <iceis2@hotmail.com>
Merge branch 'pbs' into I

Signed-off-by: http://infinity.3utilities.com/ <http://infinity.3utilities.com/>