Partially merged Nobo's pull request.
View: https://github.com/natelo/rtcwPub/pull/1