Update of previous commit
Merge pull request #162 from dbetebenner/master

Update of previous commit