Fixed lp:1098845
Merge pull request #15 from jokerdino/devel

Fixed lp:1098845