merging from dhigginbotham branch