Version 1.0

Cleanup of first commit