Updated master with current bug fixes.  Will officially release soon