codeclean
Merge pull request #451 from xanscale/master

codeclean