renamed according to jim, closes #18