Final touches #50