Merge pull request #55 from ChrisBoesch/master

update