Updating master

@jacobboland, @park9140, @jreynolds-daptiv please review and pull