Jg 2

Merging changes to master from Justin's second branch