Pulling newest version

Just pulling newest version from trjast's master.