Merge pull request #14 from KevinJW/master