Merge pull request #7 from paslavsky/GS-4

GS-4 List item
Merge branch 'master' into GS-4
GS-7 Small code cleanup