#23 beta
#20 beta
closes #20