final merge commit 4/9/2013

Merging justin's roman's changes