Pulling in changes from sgiavasis fork

0.3.4b being updated to 0.3.5-dev, sgiavasis half.