First pull request from blueoptima.com

Please pull these changes in