Code review sprint1 18 dec14

Please comment 1 or ? before merging this pull request.