closes #2 - added more