re-coding
Merge pull request #33 from sbillard/master

re-coding