Merge pull request #118 from mamarley/randomfix