merge fix
Merge pull request #19 from afragen/master

merge fix