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