Merge pull request #1 from BoostGSoC/master

update from head