Merge pull request #53 from vexxhost/scalable-functionality

Scalable functionality