First pass for Issa #324
Merge pull request #770 from sinned/master

First pass for Issa #324