Commit d043013fea859f5eb6f677cad28319d093f1dbda

Chris Young 2012-06-14T19:09:42

More changes resulting from pull request