Merge pull request #8 from cbs68/master

2 files