Added UUID
closes #12