Working on Vaadin 7
Merge pull request #3 from jcarreia/master

Working on Vaadin 7