this fixes #34

It should be expanded some to do a little clean up but that is ok for
now as it's out side the scope of the issue and more [FR]
adds the options to address #35