closes gh-279
Merge pull request #376 from fablife/master

Closes gh-279