Tested with xmlrpc calls
Merge pull request #1 from Taps1/master

Tested with xmlrpc calls