added part 1 and 3 of issue #36
Merge remote-tracking branch 'origin/master'