magjac Merge pull request #190 from magjac/four