Code review 17 dec14

Please add +1 or ? before merging the pull request