Merge pull request #12 from sfeole/master