Initial commit
Remove commented code
Demo implementation
Merge branch 'develop'