Merge pull request #49 from 210geeks/ryan

Testing and debugging