Included new files I forgot to commit earlier -- thanks Michael Cree