first try
fixes #680
address comments
Merge pull request #686 from teravest/issue680

Issue680