Bug fix
fixing more gugs
Merge pull request #2 from jmckinnell/master

Bug fix