Fix for issue #30
Merge pull request #31 from F1ashhimself/feature/compatibility_with_pytest_2.6

Fix for issue #30
Merge branch 'upstream/master' into feature/features_and_stories