Merge pull request #18 from ChrisBoesch/master

update