Merge pull request #16 from ChrisBoesch/master

update