closes #19
0.6.5