Merge pull request #6 from paslavsky/GS-7

GS-7