Fixed #134
Merge pull request #135 from giastfader/master

Fixed #134
Merge pull request #24 from baasbox/master

pull request from repository baasbox