Troubleshooting from first implementation.
Merge pull request #52 from edmundtadros/troubleshooting

Troubleshooting from first implementation.