refs #53 done
refs #49 done