Merged pull request from Ackoder
Minor changes