closes #18
extra commit