closes #361 finally!!