improving names and minor bug fix
Merge pull request #73 from mmoadeli/MAID-BUG-FIX

improving names and minor bug fix