Added functionality for REQ#0002

Added functionality for REQ#0002
Merge remote-tracking branch 'origin/Fritz'Branch' into Vin'sBranch