Merge pull request #1 from nokiadev/master

...
Merge pull request #14 from junqueira/master

Merge pull request #1 from nokiadev/master