sprint nov 27 changes
Merge pull request #3 from jdorfman/tjasko

sprint nov 27 changes