closes #12 #14