Fixed CS issues #39, Attached interdiff for same. Please review.