Merged Athran's changes.  Fixed Eclipse build errors (at least on my machine).