Added tests and fixed some bugs
Merge remote-tracking branch 'origin/master'