unfinished
finished
Merge pull request #87 from bmccaule/master

unfinished