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