Avoiding merge conflicts.
Merge pull request #42 from stephandev/master

Avoiding merge conflicts.