Merge pull request #11 from serbanu/master

Almost done
arrow+text
Merge pull request #13 from catalincatana/master

arrow+text