Fixed issues with standalone operation
Merge pull request #208 from nhr/standalone_fixes

Fixed issues with standalone operation