test
small revision
Added all functionality
Merge remote-tracking branch 'origin/master'