Shorten keywords
Add documentation, new demo