Fixed #6 - also added character limit