Fixed standalone functionality
Merge pull request #1 from danburzo/master

Fixes standalone functionality