Merging with upstream

Merge remote-tracking branch 'upstream/master' into noMockServer
Merging with upstream
Merging from upstream
Merge from upstream
Documented/commented test cases
Merge pull request #246 from iameric1986/noMockServer

Commented test cases
Merge pull request #247 from pachalad/noMockServer

No mock server
noMockServer branch
Merge pull request #1 from pachalad/master

merge