Testing from forked
Merge pull request #5 from frangeris/master

Testing from forked