#45 - Changes after review #87

#45