Merge pull request #19 from ChrisBoesch/master

update