Initial fixes to issue 236
Merge branch 'master' of github.com:LyonsLab/coge