Committing

FIXES #7