Merge pull request #15 from ChrisBoesch/master

update