Crell Merge pull request #77 from Crell/v3