Updated to GPL 3