Initial
Merge pull request #1 from kstojevich/collab_branch

Initial