- Added some sources to the issue #131 todo comment
Merge remote-tracking branch 'upstream/master'