Fix for Issue #46 in backend
Merge pull request #65 from manquer/master

Fix for Issue#46 in backend