Fixed examples, closed #15 and tests for it
Merge pull request #16 from alessioalex/master

Fixed examples, closed #15 and tests for it