Few updates
Merge pull request #629 from clark-stevenson/patch-1

Few updates