Merge pull request #1 from Patroklo/master

Updates the fork.
Adds some label and placeholder support.
Merge pull request #3 from jeroen/master

Updates views.