Added functionality for non-express environment
Merge pull request #1 from relicode/Non-express-functionality

Added functionality for non-express environment