Merge branch 'patch-20' of https://github.com/gjones2/Freeside