Fixed issues @daboross - closes #208