fixes #617
fixes #681
removed extra line
Merge pull request #690 from scopatz/no-cmake

fixes #617