Fixes #14
Merge pull request #15 from PressLabs/develop

Fixes #14