Added demo, cleaned repository, added test