Added comment about proxy
Merge branch '0.0.4'