Issue24

closes #24