sdras Merge pull request #8 from ericksoen/master