Small improvements
Merge remote-tracking branch 'origin/master'
Added some tests