manually merging #4

fixes #4 - merged manually because github can't figure it out.