Merge pull request #706 from mcmonkey4eva/master

pull request for unusual temporary work arounds