Final touches #185