redo
Merge pull request #11 from gberton/master

redo