soliton4 Merge pull request #240 from evolvedhat/master