Bug fix #6, minor updates

Bug fix #6, minor updates