Fixing issue with standalone build
closes #29
Merging master