Fix
Merge pull request #90 from 3webit/patch-15

Fix
Merge pull request #91 from realtebo/master

Small fixes + fix by Ale
Merge pull request #29 from MishFdM/master

Merge