Merge pull request #102 from khawkins/master

Latest shared