Merge pull request #254 from mancdaz/master

revert b5aca4f96a8a5e48255c2f002d52c93cc9ffb1c7