updated for a bug priya found in ilove
Merge branch 'master' of github.com:stephenrouse/heidi