Merge pull request #661 from mebigfatguy/master

spilleng