Merge pull request #14 from ggramlich/master

The changes should fix the problem on the production site
Removed duplication in smoke_test