Merge pull request #2 from geraldfletcher/master

gimme now
GER PLEASE READ ME URGENTLY!!
Merge pull request #4 from nettywhelan/master

GER PLEASE READ ME URGENTLY!!