Merge pull request #12 from ChrisBoesch/master

update