fix bug #124
Merge branch 'master' of github.com:oscaremr/oscar