closes #14
closes #13