Dev

Added contributors closes issues #309 and #307