added some requested changes
Merge pull request #1 from xenerr/ticket-1123

added some requested changes