closes #129 closes #130 marking closed issues as closed