Code review sprint10 12 dec14

Please acknowledge via 1 or ? before merging this pull request.