Nickyt bugs

@stewartmccoy Fixed issue #139.