This commit refs #25 and fixes #25 @15min