Merge pull request #180 from einhverfr/master

merging fixes for rc3 for 1.4