Added sample loading animation
Fixed conflicts and merged with hashin