First commit, more features to be added
Merge remote-tracking branch 'upstream/master'