Merge pull request #1 from silveur/standalone

Standalone
Merge pull request #2 from silveur/master

Merge pull request #1 from silveur/standalone