Manually merged pull request #2

Merged from bwcorey/master