Task 66
Fixed Bug 67
completed task 95 and fixed bug 96
Merge TFS Changeset 155