Dev

Added contributors closes issues #309 and #307
please remove this. I had forgotten to remove it before. if you remove it will merge and everything will be good.