version 1.0.2

Repaired the GitHub merge which broke several files.