[fixes #18]
Merge pull request #19 from pivotal-cf-experimental/much_branch

[fixes #18]