Implementing notes
merge
Merge remote-tracking branch 'patrick/master'