issue 54
Merge pull request #56 from alexkahn/master

issue 54