Merged in issue580againnewimports (pull request #177)
Branch name references #580 but issue is ref #613.
Planning to merge current branches in and create a beta 2 for testing.
Branch name references #580 but issue is ref #613.
Planning to merge current branches in and create a beta 2 for testing.