closes #9
minor changes