Merge pull request #28 from ChrisBoesch/master

update